Auto merge of #2316 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 25 Jan 2016 18:53:17 +0000 (18:53 +0000)
committerbors <bors@rust-lang.org>
Mon, 25 Jan 2016 18:53:17 +0000 (18:53 +0000)
commitc1a5a477e3b7750b413ce0f74d555e9e9dc562ee
treedc4c863345cd16da329c96861ed8f9d1ecbb5724
parent859c5d3c6401db45141147e6cb2482f6fa992628
parent3194a23a706c17037556c11e7bf4303ea233f208
Auto merge of #2316 - alexcrichton:update, r=alexcrichton

A few small tweaks to tests were necessary to accomodate rust-lang/rust#29520,
and a few changes were made to the code to account for that as well.